From 804f3d63d3d5728979cbc8861fc2d2fe66b6f93e Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 26 Mar 2004 16:17:33 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5020ef0da4..61014b3103d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* vc.el (vc-maybe-resolve-conflicts): Don't prompt the user.
+
 	* calc/calc.el (calc-mode-map): Use mapc.
 
 	* apropos.el (apropos-mode): Don't autoload.
-- 
2.30.2